From: H. Peter Anvin Date: Sat, 6 Sep 2008 04:28:27 +0000 (-0700) Subject: x86: when building image.iso, use isohybrid if it exists X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~26196^2^11~7 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi//%22https:/bugzilla.%22/%22http:/www.example.com/cgi/%22https:/bugzilla.%22?a=commitdiff_plain;h=d2f37384fc9957ad0162d5285a5660f0a86ef243;p=linux-4.9.git x86: when building image.iso, use isohybrid if it exists When building image.iso (make isoimage), use the isohybrid tool if it exists. isohybrid is a script included with Syslinux 3.72 and higher, which creates an image that can be booted either as a hard disk (including removable, e.g. USB disk) or as a CD-ROM. If isohybrid doesn't exist, then this has no effect. Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 7ee102f9c4f8..cceba1f46365 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -181,6 +181,7 @@ isoimage: $(BOOTIMAGE) mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ $(obj)/isoimage + isohybrid $(obj)/image.iso 2>/dev/null || true rm -rf $(obj)/isoimage zlilo: $(BOOTIMAGE)